From 2159f9c7ca302ae1ef1749a6db4464388de5896d Mon Sep 17 00:00:00 2001
From: Tor Lillqvist <tml@novell.com>
Date: Tue, 27 Nov 2007 23:28:16 +0000
Subject: [PATCH] Improve portability. The -o option is present only in newish
 GNU egreps.

2007-11-28  Tor Lillqvist  <tml@novell.com>

	* gtk/Makefile.am: Improve portability. The -o option is present
	only in newish GNU egreps. Use one more sed in the pipeline
	instead.


svn path=/trunk/; revision=19082
---
 ChangeLog       | 6 ++++++
 gtk/Makefile.am | 4 +++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 12f8d335a7..7c141eb9da 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-11-28  Tor Lillqvist  <tml@novell.com>
+
+	* gtk/Makefile.am: Improve portability. The -o option is present
+	only in newish GNU egreps. Use one more sed in the pipeline
+	instead.
+
 2007-11-28  Tor Lillqvist  <tml@novell.com>
 
 	Fix #375893, patch by Ben Hague:
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 33b7695bbe..91b712984a 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -814,7 +814,9 @@ gtktypebuiltins.c: @REBUILD@ $(gtk_public_h_sources) gtktypebuiltins.c.template
 gtktypefuncs.c: @REBUILD@ $(top_srcdir)/gtk/*.h $(top_srcdir)/gdk/*.h Makefile
 	echo '#include <gtk/gtk.h>' > xgen-gtfsrc.c && \
 	  ${CPP} $(DEFS) $(INCLUDES) -DGTK_ENABLE_BROKEN $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) xgen-gtfsrc.c | \
-	  egrep -o '\<g[td]k_[a-zA-Z0-9_]+_get_type\>' | sort | uniq | \
+	  egrep '\<g[td]k_[a-zA-Z0-9_]+_get_type\>' | \
+	  sed -e 's/.*\(\<g[td]k_[a-zA-Z0-9_]\+_get_type\>\).*/\1/' | \
+	  sort | uniq | \
 	  sed '{ s/^/vgt=/; s/$$/();/; }' > xgen-gtf \
 	&& cp xgen-gtf $@ && rm -f xgen-gtf
 gtktestutils.c: gtktypefuncs.c
-- 
2.30.2